From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 27 Oct 2013 10:32:27 +0000 (+0100)
Subject: notificationDaemon: Fix custom icons
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3155
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=41315f45a94aa6a45b19108067b102f41048ae0a;p=gnome-shell.git

notificationDaemon: Fix custom icons

The 'icon' property contains a serialized GIcon, so we need to
deserialize it when setting the icon.

https://bugzilla.gnome.org/show_bug.cgi?id=710596
---

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index a1b76ab15..96b147274 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -745,7 +745,8 @@ const GtkNotificationDaemonNotification = new Lang.Class({
         this._defaultAction = defaultAction ? defaultAction.unpack() : null;
         this._defaultActionTarget = defaultActionTarget;
 
-        this.update(title.unpack(), body ? body.unpack() : null, { gicon: gicon });
+        this.update(title.unpack(), body ? body.unpack() : null,
+                    { gicon: gicon ? Gio.icon_deserialize(gicon) : null });
     },
 
     _activateAction: function(namespacedActionId, target) {